[automerger skipped] Revert^4 "CalendarTests minsdk bump from 19 to 21" am: 9820c9c120 -s ours am skip reason: Merged-In Ia2f80a011daaf4921032538dea98627c83d30843 with SHA-1 00ad9ed676 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/3146300 Change-Id: I564e7a0a57923dc142887e4a084a727199ba518b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>